(x_set_font): Always store a font to the font parameter,

never a fontset. (Bug#1562)

diff --git a/src/frame.c b/src/frame.c
index 7db5a1e1fcb9be3be9b18d735274a75e463b1ca1..7074e14077e5f74ef970cbeb8e7b6b988d5940a9 100644 (file)
--- a/src/frame.c
+++ b/src/frame.c
@@ -3391,7 +3391,7 @@ x_set_font (f, arg, oldval)
          font_object = font_open_by_name (f, SDATA (ascii_font));
          if (NILP (font_object))
            error ("Font `%s' is not defined", SDATA (arg));
-         arg = fontset_name (fontset);
+         arg = AREF (font_object, FONT_NAME_INDEX);
        }
       else
        error ("The default fontset can't be used for a frame font");